Merge version 1:17.0.6-18+rpi1 and 1:17.0.6-19 to produce 1:17.0.6-19+rpi1

diff --cc debian/changelog
index 1a7237bf2ce8655c4ed16004578477ec05ac128c,ca25837d582c397360d689796038bc6d28caccb2..028dde7c70fbadd068c269bf1036651060639355
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,9 +1,56 @@@
- llvm-toolchain-17 (1:17.0.6-18+rpi1) trixie-staging; urgency=medium
++llvm-toolchain-17 (1:17.0.6-19+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green]
 +  * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated.
 +
 +  [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green]
 +  * Disable scudo on armhf, it needs atomics which we do not want to enable.
 +
 +  [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Nov 2021 22:37:30 +0000]
 +  * Remove armhf from architecture list for libunwind-13-dev dependency.
 +
-  -- Peter Michael Green <plugwash@debian.org>  Thu, 30 May 2024 19:02:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 14 Jan 2025 09:08:49 +0000
++
+ llvm-toolchain-17 (1:17.0.6-19) unstable; urgency=medium
+ 
+   * Fix compatibility with Python 3.13. (Closes: #1084685, #1091425)
+   * Don't override dh_ocaml. Closes: #1078232.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 17 Dec 2024 11:19:10 +0100
  
  llvm-toolchain-17 (1:17.0.6-18) unstable; urgency=medium
  

diff --cc debian/patches/series
index c578e8fb95e2d18887811a089ffc3dacb0df3d76,9f65c917d1afd4f725cb4313292c4c4b0d6083d1..6520ee6b2b31d4b50e9d36d15d30611d4865600c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -45,11 -54,13 +45,10 @@@ fix-scan-view-path.dif
  lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
  lldb/lldb-missing-install.diff
  lldb/lldb-disable-swig-error.diff
 -
  # Fix arch issue
  disable-error-xray.diff
 -
  # OpenMP
  openmp/openmp-check-execstack.diff
--
  # libcxx
  libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
  libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
@@@ -78,7 -93,8 +77,6 @@@ remove-apple-clang-manpage.dif
  # Hurd port
  hurd/hurd-pathmax.diff
  hurd/hurd-amd64.diff
--
  # kfreebsd
  # kfreebsd/clang_lib_Basic_Targets.diff
  # kfreebsd/CMakeLists.txt.diff
@@@ -112,11 -132,11 +110,9 @@@ libclc-fix-prepare_builtins-rpath.dif
  llvm-runtimes-builtins-build-check.diff
  issue-54242.diff
  protobuf_3.21.patch
--
  # compiler-rt
  compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
  compiler-rt/compilerrt-build-scudo-standalone-option.diff
--
  # wasm patches
  wasm/wasm-ld-path.diff
  wasm/wasm-compiler-rt-default.diff
@@@ -138,4 -159,4 +134,5 @@@ link-with-package-metadata.dif
  llvm-toolchain-17-sve-types-aux-target.diff
  env-lld-package-metadata.diff
  arm64-clang-gcc-14.patch
+ python3.13-quote.diff
 +raspbian-triplet.patch

diff --cc debian/rules
Simple merge